Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 00:32:06 +0000 (00:32 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 30 May 2010 00:32:06 +0000 (00:32 +0000)
commitc6bff60f0cca05cc56ff65a246b3f55ab3782cc3
tree3d3fb4e8c884f8e6139d244a6bb47138debccfb1
parentdd51e386f79022dbc172122479b93c9f1c05b91f
parent279c0fd2af91077543dbfa06d3236d9f1d3fdec3
Merge from mainline.